Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Thu, 27 Feb 2014 23:20:02 +0000 (07:20 +0800)
committerXue Fuqiao <xfq@gnu.org>
Thu, 27 Feb 2014 23:20:02 +0000 (07:20 +0800)

Trivial merge